Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 12 Jan 2011 05:57:19 +0000 (21:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 12 Jan 2011 05:57:19 +0000 (21:57 -0800)
commita12544bd33359fd44e5218d110ea0abfd1f7c823
treef2a5a3520c4b2390a65296940146048b1009030c
parent8c59c4b46c78c2cc0556315dce451aabd2a8ed0e
parent51e240b375e74976cc32d571a9ebe85564f3b843
Merge from mainline.
src/ChangeLog
src/fns.c
src/image.c